tests: do not leave running httpd after tests exit

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

diff --git a/tests/libtest.sh b/tests/libtest.sh
index e9d4450c7405405df347c8aceb64e9728465ae07..459040d39de926d4d72a864dd96a496c59dbe09b 100644 (file)
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -157,7 +157,7 @@ setup_fake_remote_repo1() {
     mkdir ${test_tmpdir}/httpd
     cd httpd
     ln -s ${test_tmpdir}/ostree-srv ostree
-    ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port $args
+    ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port $args
     port=$(cat ${test_tmpdir}/httpd-port)
     echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
     cd ${oldpwd} 
@@ -261,7 +261,7 @@ EOF
     mkdir ${test_tmpdir}/httpd
     cd httpd
     ln -s ${test_tmpdir} ostree
-    ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port $args
+    ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port $args
     port=$(cat ${test_tmpdir}/httpd-port)
     echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
     cd ${oldpwd} 

diff --git a/tests/test-commit-sign.sh b/tests/test-commit-sign.sh
index 516d6550c92d4682b5609d3f2991c9a361f07475..5e4baff66665f23bfa208a66d5f912d1292d7f31 100755 (executable)
--- a/tests/test-commit-sign.sh
+++ b/tests/test-commit-sign.sh
@@ -51,7 +51,7 @@ cd ${test_tmpdir}
 mkdir ${test_tmpdir}/httpd
 cd httpd
 ln -s ${test_tmpdir}/ostree-srv ostree
-ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port
+ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port
 port=$(cat ${test_tmpdir}/httpd-port)
 echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
 cd ${oldpwd} 

diff --git a/tests/test-pull-metalink.sh b/tests/test-pull-metalink.sh
index 3d685788512d4b5b0ce05568ea2228f95624b2fa..3cd425b3c106997fe59bea10b996a88a6301721d 100755 (executable)
--- a/tests/test-pull-metalink.sh
+++ b/tests/test-pull-metalink.sh
@@ -27,7 +27,7 @@ setup_fake_remote_repo1 "archive-z2"
 cd ${test_tmpdir}
 mkdir metalink-data
 cd metalink-data
-ostree trivial-httpd --daemonize -p ${test_tmpdir}/metalink-httpd-port
+ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/metalink-httpd-port
 metalink_port=$(cat ${test_tmpdir}/metalink-httpd-port)
 echo "http://127.0.0.1:${metalink_port}" > ${test_tmpdir}/metalink-httpd-address